From: Paul Eggert Date: Sun, 6 Feb 2011 20:12:53 +0000 (-0800) Subject: * minibuf.c: conform to C89 pointer rules X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4685^2~45 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=0f489d2ff2bb4e0b827e89a482bd77c2aeb3cfbf;p=emacs.git * minibuf.c: conform to C89 pointer rules --- diff --git a/src/ChangeLog b/src/ChangeLog index fc5eb13e06b..f2042188c3f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -18,6 +18,7 @@ * keyboard.c (echo_char, MULTI_LETTER_MOD, tty_read_avail_input): Likewise. * keymap.c (Ftext_char_description): Likewise. + * minibuf.c (Fread_buffer): Likewise. * insdel.c (insert, insert_and_inherit, insert_before_markers): (insert_before_markers_and_inherit, insert_1, insert_1_both): Likewise. This changes these functions' signatures, which is diff --git a/src/minibuf.c b/src/minibuf.c index 921657b450a..ec243daac19 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1091,7 +1091,7 @@ function, instead of the usual behavior. */) (Lisp_Object prompt, Lisp_Object def, Lisp_Object require_match) { Lisp_Object args[4], result; - unsigned char *s; + char *s; int len; int count = SPECPDL_INDEX (); @@ -1113,7 +1113,7 @@ function, instead of the usual behavior. */) if (STRINGP (prompt)) { - s = SDATA (prompt); + s = SSDATA (prompt); len = strlen (s); if (len >= 2 && s[len - 2] == ':' && s[len - 1] == ' ') len = len - 2;